From acd654b90bada8f805c5e1e4a8611a29a013e354 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 2 Oct 2016 12:33:42 -0500 Subject: [PATCH] Update debian control and copyright for 25.1 --- debian/control | 84 ++++++++++++++++++++++++------------------------ debian/copyright | 6 ++-- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/debian/control b/debian/control index 416495940bb..eebb62e0532 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: emacs24 +Source: emacs25 Section: editors Priority: optional Maintainer: Rob Browning @@ -17,101 +17,101 @@ Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, lib Homepage: http://www.gnu.org/software/emacs/ Standards-Version: 3.7.2 -Package: emacs24-lucid +Package: emacs25-lucid Architecture: any -Depends: emacs24-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Provides: emacs24, emacsen, editor, info-browser, mail-reader, news-reader -Suggests: emacs24-common-non-dfsg -Conflicts: emacs24, emacs24-nox -Replaces: emacs24, emacs24-nox +Depends: emacs25-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Provides: emacs25, emacsen, editor, info-browser, mail-reader, news-reader +Suggests: emacs25-common-non-dfsg +Conflicts: emacs25, emacs25-nox +Replaces: emacs25, emacs25-nox Description: GNU Emacs editor (with Lucid GUI support) GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs with support for a graphical user interface based on the Lucid toolkit (instead of the GTK+ interface - provided by the emacs24 package). Until some known GTK+ + provided by the emacs25 package). Until some known GTK+ problems are fixed, this version may help avoid crashing Emacs during an emacsclient disconnect. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567934 and https://bugzilla.gnome.org/show_bug.cgi?id=85715 for more information. -Package: emacs24-lucid-dbg +Package: emacs25-lucid-dbg Section: debug Priority: extra Architecture: any -Depends: emacs24-lucid-dbg (= ${binary:Version}), ${misc:Depends} -Description: Debugging symbols for emacs24-lucid +Depends: emacs25-lucid-dbg (= ${binary:Version}), ${misc:Depends} +Description: Debugging symbols for emacs25-lucid GNU Emacs is the extensible self-documenting text editor. This - package contains the debugging symbols for the emacs24-lucid + package contains the debugging symbols for the emacs25-lucid package. -Package: emacs24-nox +Package: emacs25-nox Architecture: any -Depends: emacs24-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Provides: emacs24, editor, emacsen, info-browser, mail-reader, news-reader -Suggests: emacs24-common-non-dfsg -Conflicts: emacs24, emacs24-lucid -Replaces: emacs24, emacs24-lucid +Depends: emacs25-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Provides: emacs25, editor, emacsen, info-browser, mail-reader, news-reader +Suggests: emacs25-common-non-dfsg +Conflicts: emacs25, emacs25-lucid +Replaces: emacs25, emacs25-lucid Description: GNU Emacs editor (without GUI support) GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs compiled without support for X, and provides only a text terminal interface. -Package: emacs24-nox-dbg +Package: emacs25-nox-dbg Section: debug Priority: extra Architecture: any -Depends: emacs24-nox-dbg (= ${binary:Version}), ${misc:Depends} -Description: Debugging symbols for emacs24-nox +Depends: emacs25-nox-dbg (= ${binary:Version}), ${misc:Depends} +Description: Debugging symbols for emacs25-nox GNU Emacs is the extensible self-documenting text editor. This - package contains the debugging symbols for the emacs24-nox + package contains the debugging symbols for the emacs25-nox package. -Package: emacs24 +Package: emacs25 Architecture: any -Depends: emacs24-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: emacs25-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: editor, emacsen, info-browser, mail-reader, news-reader -Suggests: emacs24-common-non-dfsg -Conflicts: emacs24-lucid, emacs24-nox -Replaces: emacs24-lucid, emacs24-nox +Suggests: emacs25-common-non-dfsg +Conflicts: emacs25-lucid, emacs25-nox +Replaces: emacs25-lucid, emacs25-nox Description: GNU Emacs editor (with GTK+ GUI support) GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs with a graphical user interface based on GTK+ (instead of the Lucid toolkit provided by the - emacs24-lucid package). + emacs25-lucid package). -Package: emacs24-dbg +Package: emacs25-dbg Section: debug Priority: extra Architecture: any -Depends: emacs24-dbg (= ${binary:Version}), ${misc:Depends} -Description: Debugging symbols for emacs24 +Depends: emacs25-dbg (= ${binary:Version}), ${misc:Depends} +Description: Debugging symbols for emacs25 GNU Emacs is the extensible self-documenting text editor. This - package contains the debugging symbols for the emacs24 package. + package contains the debugging symbols for the emacs25 package. -Package: emacs24-bin-common +Package: emacs25-bin-common Architecture: any -Depends: emacs24-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: emacs25-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} Description: GNU Emacs editor's shared, architecture dependent files GNU Emacs is the extensible self-documenting text editor. This package contains the architecture dependent infrastructure - that's shared by emacs24, emacs24-lucid, and emacs24-nox. + that's shared by emacs25, emacs25-lucid, and emacs25-nox. -Package: emacs24-common +Package: emacs25-common Architecture: all Depends: emacsen-common (>= 2.0.8), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}, ${misc:Depends} -Recommends: emacs24-el -Suggests: emacs24-el, emacs24-common-non-dfsg, ncurses-term -Conflicts: emacs24-el (<< ${source:Version}), cedet, eieio, speedbar, gnus-bonus-el +Recommends: emacs25-el +Suggests: emacs25-el, emacs25-common-non-dfsg, ncurses-term +Conflicts: emacs25-el (<< ${source:Version}), cedet, eieio, speedbar, gnus-bonus-el Breaks: apel (<< 10.8+0.20120427-4) Description: GNU Emacs editor's shared, architecture independent infrastructure GNU Emacs is the extensible self-documenting text editor. This package contains the architecture independent infrastructure - that's shared by emacs24, emacs24-lucid, and emacs24-nox. + that's shared by emacs25, emacs25-lucid, and emacs25-nox. -Package: emacs24-el +Package: emacs25-el Architecture: all -Depends: emacs24-common (= ${source:Version}), ${misc:Depends} +Depends: emacs25-common (= ${source:Version}), ${misc:Depends} Description: GNU Emacs LISP (.el) files GNU Emacs is the extensible self-documenting text editor. This package contains the elisp sources for the convenience of users, diff --git a/debian/copyright b/debian/copyright index e07418796ae..b8fb0b7bf5f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,12 +4,12 @@ This package was debianized by Rob Browning on Tue, 16 Dec 1997 00:05:45 -0600. The original source for this package can be found at -git://git.savannah.gnu.org/emacs.git under the emacs-24.5 tag. +git://git.savannah.gnu.org/emacs.git under the emacs-25.1 tag. That tag was used to create the Debian upstream archive -(emacs24_24.5+1.orig.tar.bz2) after making adjustments to comply with +(emacs25_25.1+1.orig.tar.xz) after making adjustments to comply with the DFSG (see below). -Please see /usr/share/doc/emacs24-common/README.Debian.gz for a +Please see /usr/share/doc/emacs25-common/README.Debian.gz for a description of the Debian specific differences from the upstream version. -- 2.30.2